Fix Multitenancy Support and Normalize Tenant ID Handling by sfmskywalker · Pull Request #7217 · elsa-workflows/elsa-core

sfmskywalker · 2026-01-28T12:26:33Z

This change fixes an issue with workflow definitions and multitenancy support and standardizes tenant ID handling, updates database indexes, and modifies workflow definition loading to respect tenant boundaries.

An empty string ("") is used as the default tenant ID. Backward compatibility is preserved through tenant ID normalization.

Changes

ADR Documentation

Added ADRs for:
- Token-centric flowchart execution
- Tenant deletion events
- Merge modes
- Empty string default tenant ID

Tenant ID Normalization

Introduced the NormalizeTenantId() extension method.
Converts null tenant IDs to empty strings.

Default Tenant ID

Standardized the use of an empty string ("") as the default tenant ID.
Defined Tenant.DefaultTenantId = "".

Workflow Definition Loading

Modified DefaultWorkflowDefinitionStorePopulator to filter workflow definitions based on the current tenant.

Database Index Updates

Updated database indexes for stored triggers to include TenantId.
Implemented using EF Core migrations to support multitenancy.

Multitenancy Configuration

Enabled configuration-based multitenancy in Program.cs.
Configuration is sourced from appsettings.json.
Updated the tenant resolution pipeline accordingly.

Appsettings.json Update

Added tenant-specific settings to appsettings.json.

Unit Tests

Added unit tests for:
- Tenant ID normalization
- Multitenancy pipeline invoker

Impact

Behavioral Changes

Workflow definitions are now filtered by tenant.
Consistent handling of the default tenant is enforced.

Dependencies Affected

Workflow definition loading
Trigger registration
Tenant resolution components

Potential Migration

Existing data stores with null tenant IDs should be migrated to empty strings.

Breaking Changes

No immediate breaking changes
The NormalizeTenantId() extension ensures backward compatibility for code that previously used null tenant IDs.

- Activate multitenancy in `Program.cs`. - Introduce `NormalizeTenantId` method for consistent tenant ID usage. - Update tenant-related classes and features to support normalization logic.

- Standardized the tenant ID for the default tenant to use an empty string (`""`) instead of `null`. - Documented the rationale and migration considerations in ADR 0007. - Updated ADR table of contents and graph for new entry.

src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs

Copilot

Pull request overview

This PR standardizes the multitenancy system on using an empty string ("") as the default tenant ID instead of null, and documents the decision as an ADR. It introduces a normalization helper to keep behavior backward compatible while fixing dictionary usage issues and wiring multitenancy into the sample server.

Changes:

Define Tenant.DefaultTenantId = "" and update the default tenant to use this constant.
Add a NormalizeTenantId() extension and use it in tenant resolution code to safely handle null IDs in dictionaries and lookups.
Enable multitenancy in Elsa.Server.Web, and add ADR 0007 plus updates to the ADR TOC and graph to record the architectural decision.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
`src/modules/Elsa.Tenants/Services/DefaultTenantResolverPipelineInvoker.cs`	Normalizes tenant IDs when building the tenant dictionary and when resolving tenant IDs, preventing `null` keys and aligning with the new default ID convention.
`src/modules/Elsa.Tenants/Extensions/ModuleExtensions.cs`	Adds `[UsedImplicitly]` attributes and updates the tenants module extension, but currently introduces invalid syntax around tenant management extension methods that will prevent compilation.
`src/modules/Elsa.Common/Multitenancy/Extensions/TenantsProviderExtensions.cs`	Introduces `NormalizeTenantId(this string? tenantId)` to convert `null` to `Tenant.DefaultTenantId`, centralizing the default tenant ID normalization logic.
`src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs`	Adds `Tenant.DefaultTenantId = ""` and updates `Tenant.Default.Id` to use it, making the default-tenant ID convention explicit and dictionary-safe.
`src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolverContext.cs`	Updates `FindTenant` to accept `string?` and normalize IDs before dictionary lookup, ensuring consistent behavior when callers pass `null` for the default tenant.
`src/apps/Elsa.Server.Web/Program.cs`	Enables multitenancy by default and installs the tenants feature via `elsa.UseTenants()` when `useMultitenancy` is `true`, wiring the new default-tenant behavior into the sample server (with a small style inconsistency on the new `if` statement).
`doc/adr/toc.md`	Extends the ADR table of contents with entries for explicit merge modes (ADR 6) and the empty-string default tenant ID (ADR 7), documenting the new architectural decision.
`doc/adr/graph.dot`	Updates the ADR dependency graph to include ADRs 6 and 7, but currently redefines node `_4` with a different label/URL, making the graph inconsistent with the TOC and overriding the “Activity Execution Snapshots” label.
`doc/adr/0007-empty-string-as-default-tenant-id.md`	Adds a new ADR describing the move to `""` as the default tenant ID, including context, decision, and consequences for the multitenancy subsystem.

src/modules/Elsa.Tenants/Extensions/ModuleExtensions.cs

src/apps/Elsa.Server.Web/Program.cs

doc/adr/graph.dot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…enancy condition formatting.

…modes, and default tenant ID - Introduced ADR 0005: Token-centric flowchart execution model for improved loop and join handling. - Added ADR 0006: Tenant Deleted event for distinct handling of tenant removal. - Documented ADR 0007: Explicit merge modes for flowchart joins, improving reliability and configurability. - Included ADR 0008: Standardization of empty string as the default tenant ID for consistency and clarity.

…invoker - Added comprehensive unit tests for tenant ID normalization to ensure consistent handling of null, empty, and valid IDs. - Introduced tests for the multitenancy pipeline invoker covering various tenant resolution scenarios. - Updated solution to include new unit testing projects for `Elsa.Tenants` and `Elsa.Common`.

- Refactor test parameterization to verify `HasExceptions` property more explicitly. - Simplify exception creation logic in helper methods. - Improve test assertions by combining act and assert phases where applicable.

Copilot

Pull request overview

Copilot reviewed 19 out of 19 changed files in this pull request and generated 3 comments.

src/modules/Elsa.Tenants/Extensions/ModuleExtensions.cs

doc/adr/toc.md

Elsa.sln

- Introduced a configuration-based tenant provider to streamline tenant initialization and customization. - Added tenant ID handling filters to ensure tenant ID is applied and filtered automatically. - Deprecated the `CommonPersistenceFeature` in favor of modular persistence feature extension.

- Added `TenantId` to unique constraints on `Triggers` table across all EFCore providers. - Adjusted index names to reflect the updated constraints. - Updated trigger configuration to ensure uniqueness includes `TenantId`.

- Introduced `ITenantAccessor` to support tenant-specific filtering of workflow definitions. - Updated logic to skip workflows not matching the current tenant.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…kflowDefinitionStorePopulator`

…ion tests

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

… multitenancy - Added `TenantId` to unique constraints on the `Triggers` table and updated index names. - Included logic to drop outdated indexes without `TenantId` during migration. - Adjusted tests to account for `TenantId` in workflow identity and indexing scenarios.

…rigger indexing tests

Copilot

Pull request overview

Copilot reviewed 33 out of 34 changed files in this pull request and generated 1 comment.

Files not reviewed (1)

src/modules/Elsa.Persistence.EFCore.SqlServer/Migrations/Runtime/20251204150326_V3_6.Designer.cs: Language not supported

Elsa.sln

- Added `SelectiveMockLockProvider` to allow targeted lock mocking without affecting unrelated background operations. - Updated test services to use `SelectiveMockLockProvider` in place of `TestDistributedLockProvider`. - Refactored `DistributedLockResilienceTests` to support selective mocking for deterministic and reliable assertions.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 37 out of 38 changed files in this pull request and generated 1 comment.

Files not reviewed (1)

src/modules/Elsa.Persistence.EFCore.SqlServer/Migrations/Runtime/20251204150326_V3_6.Designer.cs: Language not supported

src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs

src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolverContext.cs

src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs

Copilot · 2026-01-29T08:13:54Z

@sfmskywalker I've opened a new pull request, #7221, to work on those changes. Once the pull request is ready, I'll request review from you.

…tor` for consistent filtering

src/modules/Elsa.Persistence.EFCore/Modules/Runtime/Configurations.cs

src/modules/Elsa.Tenants/Services/DefaultTenantResolverPipelineInvoker.cs

…ed state handling - Updated `TenantResolverResult` to include an explicit `_isResolved` property. - Adjusted `ResolveTenantId()` and `IsResolved` logic for improved clarity and robustness. - Simplified tenant resolution invocation in `TenantResolverBase`. - Removed redundant normalization in `DefaultTenantResolverPipelineInvoker`.

…tor` and `ClrWorkflowsProvider`.

…bject initializations and add tenant-specific test coverage for `PopulateStoreAsync`.

Copilot

Pull request overview

Copilot reviewed 40 out of 41 changed files in this pull request and generated 5 comments.

Files not reviewed (1)

src/modules/Elsa.Persistence.EFCore.SqlServer/Migrations/Runtime/20251204150326_V3_6.Designer.cs: Language not supported

src/modules/Elsa.Persistence.EFCore.MySql/Migrations/Runtime/20251204150235_V3_6.cs

src/modules/Elsa.Common/Multitenancy/Results/TenantResolverResult.cs

src/modules/Elsa.Persistence.EFCore.Sqlite/Migrations/Runtime/20251204150006_V3_6.cs

src/modules/Elsa.Persistence.EFCore.PostgreSql/Migrations/Runtime/20251204150341_V3_6.cs

src/modules/Elsa.Persistence.EFCore.Oracle/Migrations/Runtime/20251204150355_V3_6.cs

sfmskywalker added 2 commits January 27, 2026 14:30

Enable multitenancy support and normalize tenant ID handling.

15fd780

- Activate multitenancy in `Program.cs`. - Introduce `NormalizeTenantId` method for consistent tenant ID usage. - Update tenant-related classes and features to support normalization logic.

Add ADR for adopting empty string as the default tenant ID

847a427

- Standardized the tenant ID for the default tenant to use an empty string (`""`) instead of `null`. - Documented the rationale and migration considerations in ADR 0007. - Updated ADR table of contents and graph for new entry.

Copilot AI review requested due to automatic review settings January 28, 2026 12:26

Copilot started reviewing on behalf of sfmskywalker January 28, 2026 12:26 View session

sfmskywalker commented Jan 28, 2026

View reviewed changes

src/modules/Elsa.Common/Multitenancy/Entities/Tenant.cs Outdated Show resolved Hide resolved

Apply suggestion from @sfmskywalker

07fe0e7

Copilot AI reviewed Jan 28, 2026

View reviewed changes

src/modules/Elsa.Tenants/Extensions/ModuleExtensions.cs Show resolved Hide resolved

src/apps/Elsa.Server.Web/Program.cs Outdated Show resolved Hide resolved

doc/adr/graph.dot Outdated Show resolved Hide resolved

sfmskywalker and others added 7 commits January 28, 2026 13:42

Update doc/adr/graph.dot

e385234

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Normalize spacing and improve readability in Program.cs. Fix multit…

62c9989

…enancy condition formatting.

Merge remote-tracking branch 'origin/bug/tenant-id' into bug/tenant-id

02ac3e5

Fix ADR numbering and update TOC

0fe0919

Update unit tests for ActivityConstructionResult

d849aea

- Refactor test parameterization to verify `HasExceptions` property more explicitly. - Simplify exception creation logic in helper methods. - Improve test assertions by combining act and assert phases where applicable.

sfmskywalker requested a review from Copilot January 28, 2026 17:58

Copilot started reviewing on behalf of sfmskywalker January 28, 2026 17:58 View session

Copilot AI reviewed Jan 28, 2026

View reviewed changes

src/modules/Elsa.Tenants/Extensions/ModuleExtensions.cs Show resolved Hide resolved

doc/adr/toc.md Outdated Show resolved Hide resolved

Elsa.sln Show resolved Hide resolved

sfmskywalker and others added 6 commits January 28, 2026 19:06

Add tenant filtering to DefaultWorkflowDefinitionStorePopulator

4395aff

- Introduced `ITenantAccessor` to support tenant-specific filtering of workflow definitions. - Updated logic to skip workflows not matching the current tenant.

Update doc/adr/toc.md

42a7c49

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Remove CommonPersistenceFeature as it has been deprecated

dec0f4a

Merge remote-tracking branch 'origin/bug/tenant-id' into bug/tenant-id

d5e4e59

sfmskywalker changed the title ~~Standardizes default tenant ID to empty string~~ Fix Multitenancy Support and Normalize Tenant ID Handling Jan 28, 2026

sfmskywalker requested a review from Copilot January 28, 2026 18:21

Copilot started reviewing on behalf of sfmskywalker January 28, 2026 18:21 View session

sfmskywalker added 2 commits January 28, 2026 19:22

Add tenant-specific filtering to workflow import logic in `DefaultWor…

9bcd6ca

…kflowDefinitionStorePopulator`

Replace hardcoded tenant ID with Tenant.DefaultTenantId in integrat…

6833d5e

…ion tests

Copilot AI reviewed Jan 28, 2026

View reviewed changes

sfmskywalker requested a review from Copilot January 28, 2026 19:34

Copilot started reviewing on behalf of sfmskywalker January 28, 2026 19:34 View session

Remove TenantId from workflow identity construction in concurrent t…

7ec5bef

…rigger indexing tests

Copilot AI reviewed Jan 28, 2026

View reviewed changes

Elsa.sln Outdated Show resolved Hide resolved

sfmskywalker and others added 2 commits January 28, 2026 21:48

Update Elsa.sln

0b271d6

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

sfmskywalker requested a review from Copilot January 28, 2026 21:05

Copilot started reviewing on behalf of sfmskywalker January 28, 2026 21:05 View session

Copilot AI reviewed Jan 28, 2026

View reviewed changes

src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs Show resolved Hide resolved

j03y-nxxbz reviewed Jan 29, 2026

View reviewed changes

src/modules/Elsa.Common/Multitenancy/Contexts/TenantResolverContext.cs Show resolved Hide resolved

j03y-nxxbz reviewed Jan 29, 2026

View reviewed changes

src/modules/Elsa.Workflows.Runtime/Services/DefaultWorkflowDefinitionStorePopulator.cs Outdated Show resolved Hide resolved

Copilot AI mentioned this pull request Jan 29, 2026

[WIP] Fix multitenancy support and tenant ID handling #7221

Closed

sfmskywalker added 2 commits January 29, 2026 09:25

Normalize tenant ID handling in `DefaultWorkflowDefinitionStorePopula…

ee44768

…tor` for consistent filtering

Merge remote-tracking branch 'origin/bug/tenant-id' into bug/tenant-id

d693d58

sfmskywalker linked an issue Jan 29, 2026 that may be closed by this pull request

Tenant filtering not working for workflow definitions after upgrading to Elsa 3.6.0-rc2 #7210

Closed

lukhipolito-nexxbiz reviewed Jan 29, 2026

View reviewed changes

src/modules/Elsa.Persistence.EFCore/Modules/Runtime/Configurations.cs Show resolved Hide resolved

lukhipolito-nexxbiz reviewed Jan 29, 2026

View reviewed changes

src/modules/Elsa.Tenants/Services/DefaultTenantResolverPipelineInvoker.cs Outdated Show resolved Hide resolved

j03y-nxxbz approved these changes Jan 29, 2026

View reviewed changes

sfmskywalker and others added 2 commits January 30, 2026 18:58

Normalize tenant ID handling in `DefaultWorkflowDefinitionStorePopula…

8b22c06

…tor` and `ClrWorkflowsProvider`.

Refactor DefaultWorkflowDefinitionStorePopulatorTests: streamline o…

cc36043

…bject initializations and add tenant-specific test coverage for `PopulateStoreAsync`.

sfmskywalker requested a review from Copilot January 30, 2026 18:35

Copilot started reviewing on behalf of sfmskywalker January 30, 2026 18:35 View session

Copilot AI reviewed Jan 30, 2026

View reviewed changes

sfmskywalker merged commit b09a564 into release/3.6.0 Jan 30, 2026
8 of 10 checks passed

sfmskywalker deleted the bug/tenant-id branch January 30, 2026 18:54

This was referenced Mar 5, 2026

Bump the elsa group with 4 updates futugyou/CodeFragments#1324

Merged

Bump the all-nuget group with 19 updates bc-solutions-coder/Foundry#38

Open

Conversation

sfmskywalker commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

ADR Documentation

Tenant ID Normalization

Default Tenant ID

Workflow Definition Loading

Database Index Updates

Multitenancy Configuration

Appsettings.json Update

Unit Tests

Impact

Behavioral Changes

Dependencies Affected

Potential Migration

Breaking Changes

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jan 29, 2026

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

sfmskywalker commented Jan 28, 2026 •

edited

Loading